Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CI fixes for #1598, #1599 #1600

Merged
merged 6 commits into from
Jan 4, 2024
Merged

CI fixes for #1598, #1599 #1600

merged 6 commits into from
Jan 4, 2024

Conversation

RyanGlScott
Copy link
Contributor

Two CI fixes:

Switch from haskell/actions/setup to haskell-actions/setup

Fixes #1598.

Pin alex to 3.4.0.1 in cryptol-remote-api Dockerfile

Fixes #1599.

@RyanGlScott
Dockerfiles: Sync cabal-install version with CI
2d781a2
@RyanGlScott
cryptol-remote-api Dockerfile: Add /root/.local/bin to PATH
88cc752 
This is necessary to ensure that `alex` and `happy` are located on the `PATH`
when building GHC.
kquick
kquick approved these changes Jan 4, 2024
View reviewed changes
Copy link
Member

@kquick kquick left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a couple of suggestions for additional documentation.

cryptol-remote-api/Dockerfile Outdated Show resolved Hide resolved
@RyanGlScott
cryptol-remote-api Dockerfile: Factor out {ALEX,HAPPY}VER, documentation
5e0ea61 
We put these near the top of the Dockerfile alongside `GHCVER` to make it
easier to remember to update them when `GHCVER` is updated.
@RyanGlScott RyanGlScott merged commit 8b0d188 into master Jan 4, 2024
43 checks passed
@RyanGlScott RyanGlScott deleted the T1598-1599-ci-fixes branch January 4, 2024 20:02
@RyanGlScott
Copy link
Contributor Author

Sigh. I should have kicked off a separate, nightly pipeline to test my last commit, since it ended up being subtly incorrect. See this CI error:

 > [toolchain 6/6] RUN if true; then         ghcup install ghc 8.10.2 &&         ghcup set ghc 8.10.2 &&         cabal v2-update &&         cabal v2-install alex-${ALEXVER} happy-${HAPPYVER} &&         git clone --recurse-submodules --depth 1 --branch ghc-9.2.8-release https://gitlab.haskell.org/ghc/ghc.git &&         cd ./ghc &&         git apply ../ghc-portability.patch &&         ./boot &&         ./configure &&         make -j &&         make install &&         cd .. &&         rm -rf ./ghc &&         ghcup rm ghc 8.10.2;     else         ghcup install ghc 9.2.8 &&         ghcup set ghc 9.2.8;     fi:
49.64 Config file path source is default config file.
49.64 Config file not found: /root/.config/cabal/config
49.64 Writing default configuration to /root/.config/cabal/config
49.79 Downloading the latest package list from hackage.haskell.org
66.74 Package list of hackage.haskell.org has been updated.
66.74 The index-state is set to 2024-01-05T06:50:50Z.
66.78 Error: cabal: Invalid package ID: alex-
66.78 "<eitherParsec>" (line 1, column 6):
66.78 unexpected end of input

Judging from that error message, ALEXVER didn't get substituted into alex-${ALEXVER} because I failed to put ARG ALEXVER in the stage of the Dockerfile that references ALEXVER. I'll submit a follow-up patch shortly (and properly test it this time).

RyanGlScott added a commit that referenced this pull request Jan 5, 2024
@RyanGlScott
cryptol-remote-api Dockerfile: Properly declare ARGs in toolchain stage
c182d70 
Addresses the issue identified in
#1600 (comment).
@RyanGlScott RyanGlScott mentioned this pull request Jan 5, 2024
Merged
@kquick
Copy link
Member

kquick commented Jan 5, 2024

No good deed... Been there, done that. C'est la vie, and all that bolderdash. :-)

RyanGlScott added a commit that referenced this pull request Jan 5, 2024
@RyanGlScott
cryptol-remote-api Dockerfile: Properly declare ARGs in toolchain sta…
3b9f6c5 
…ge (#1601)

Addresses the issue identified in
#1600 (comment).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kquick kquick kquick approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@RyanGlScott @kquick